[MIRROR] Android doesn't need epipen #767
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Android doesn't need epipen * Merge Master, Resolve conflict --------- Co-authored-by: Xackii <[email protected]> Co-authored-by: SomeRandomOwl <[email protected]>
Steals-The-PRs
added
Mirroring conflict
…into upstream-mirror-25172
…into upstream-mirror-25172
AnywayFarus
added a commit
that referenced
this pull request
Nov 24, 2023
Iajret
pushed a commit
that referenced
this pull request
Feb 5, 2024
…767) * Removes overrides (Yes, the RD jumpsuit was technically an override, an icon from another codebase in place of TG ones...) * removes all my old and redundant comments THIS SHOULD BE IMPLIED!!! * Removes extremely dated and unsalvagable 'robo_sleek' uniform (and some missed stuff from the overrides) * sprite updates!! yahoo!! * these are actually redundant, all of these SHOULD be linking to TG's file. * fix research_director/alt missing a digi, and (hopefully) fixes CI * updates the obj icons (I Forgor)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Mirrored on Skyrat: Skyrat-SS13/Skyrat-tg#25172
Original PR: tgstation/tgstation#79234
About The Pull Request
Androids cannot receive reagents using hypospray.Androids cannot have overdose effect by any chems(damage, text about
receiving overdose, mood debuff and OVERDOSE text when viewing chemicals in the body.)
Why It's Good For The Game
Fixes tgstation/tgstation#79223
Changelog
🆑
fix: Androids cannot have overdose effect by any chems.
/:cl: